Be more forgiving about child properties

Packing properties in ui files are parsed and handled by
the container, which assumes that the child is a direct
descendant. For internal children, this is inconvenient,
because we don't want to reconstruct the entire internal
structure between the container and the child in the ui
file.

It would be best to not specify packing properties
in that case, but since existing ui files do this for
GtkInfoBar and we are about to change the internal
structure of GtkInfoBar, be more forgiving here.

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index b1be6fe9b52b2d649129c74682438ce8c0a9f30d..b118346ec9a64f3f4a1941ed3f00236ab1366ef2 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -582,6 +582,14 @@ gtk_container_buildable_set_child_property (GtkContainer *container,
   GValue gvalue = G_VALUE_INIT;
   GError *error = NULL;
 
+  if (gtk_widget_get_parent (child) != (GtkWidget *)container)
+    {
+      /* This can happen with internal children of complex
+       * widgets. Silently ignore the child properties in this case.
+       */
+      return;
+    }
+
   pspec = gtk_container_class_find_child_property
     (G_OBJECT_GET_CLASS (container), name);
   if (!pspec)